From 282ff5c0f91d7819488f8c63e177c0b84225bbf5 Mon Sep 17 00:00:00 2001 From: emanueLczirai Date: Sat, 24 Jan 2015 18:48:19 +0100 Subject: [PATCH] pass --verbose to cargo when VERBOSE env is set and also show that cargo's version after rustc's one --- Makefile.in | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/Makefile.in b/Makefile.in index 6c70d8db0..c176ee0f4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -34,6 +34,12 @@ else OPT_FLAG= endif +ifdef VERBOSE +VERBOSE_FLAG=--verbose +else +VERBOSE_FLAG= +endif + export CFG_VERSION export CFG_DISABLE_CROSS_TESTS @@ -70,10 +76,11 @@ all: $(foreach target,$(CFG_TARGET),cargo-$(target)) define CARGO_TARGET cargo-$(1): $$(CARGO) "$$(CFG_RUSTC)" -V - $$(CARGO) build --target $(1) $$(OPT_FLAG) $$(ARGS) + "$$(CARGO)" --version + $$(CARGO) build --target $(1) $$(OPT_FLAG) $$(VERBOSE_FLAG) $$(ARGS) test-unit-$(1): $$(CARGO) - $$(CARGO) test --target $(1) $$(only) + $$(CARGO) test --target $(1) $$(VERBOSE_FLAG) $$(only) endef $(foreach target,$(CFG_TARGET),$(eval $(call CARGO_TARGET,$(target)))) -- 2.30.2